Skip to content

Simplify the Findyaml-cpp module#1891

Merged
doug-walker merged 2 commits into
AcademySoftwareFoundation:mainfrom
tobim:simplify-find-yaml-cpp-cmake
Nov 12, 2023
Merged

Simplify the Findyaml-cpp module#1891
doug-walker merged 2 commits into
AcademySoftwareFoundation:mainfrom
tobim:simplify-find-yaml-cpp-cmake

Conversation

@tobim
Copy link
Copy Markdown
Contributor

@tobim tobim commented Oct 20, 2023

This fixes compatibility with yaml-cpp 0.8, which previously failed because of a get_property call with the wrong target name. I took the liberty to add a few simplifications along the way.

@linux-foundation-easycla
Copy link
Copy Markdown

linux-foundation-easycla Bot commented Oct 20, 2023 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: tobim (790ca64)
  • ✅ login: doug-walker / name: Doug Walker (e1f7985)

@tobim tobim force-pushed the simplify-find-yaml-cpp-cmake branch 2 times, most recently from 15f2581 to ec6da4e Compare October 21, 2023 07:53
@doug-walker
Copy link
Copy Markdown
Collaborator

doug-walker commented Oct 25, 2023

@tobim , thanks for the contribution. It looks like it is failing the CI on several platforms, could you take a look?

@tobim tobim force-pushed the simplify-find-yaml-cpp-cmake branch 2 times, most recently from 6c81774 to ec4cb6c Compare October 30, 2023 21:16
@tobim
Copy link
Copy Markdown
Contributor Author

tobim commented Oct 30, 2023

@doug-walker I couldn't figure out what is going wrong on the static workflow jobs locally so I took the liberty add a commit that enables a bit more output. I hope that will point me towards the problem.

@tobim tobim force-pushed the simplify-find-yaml-cpp-cmake branch 2 times, most recently from c289963 to e99b4af Compare November 1, 2023 17:44
@tobim
Copy link
Copy Markdown
Contributor Author

tobim commented Nov 1, 2023

@doug-walker can we give it another shot? I hope I got it right this time.

@tobim tobim mentioned this pull request Nov 2, 2023
Closed
remia
remia reviewed Nov 4, 2023
View reviewed changes
Copy link
Copy Markdown
Collaborator

@remia remia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @tobim, I added a few comments below.

Comment thread share/cmake/modules/Findyaml-cpp.cmake Outdated
Comment thread share/cmake/modules/Findyaml-cpp.cmake Outdated
Comment thread share/cmake/modules/Findyaml-cpp.cmake
Comment thread share/cmake/modules/Findyaml-cpp.cmake Outdated
@irieger irieger mentioned this pull request Nov 8, 2023
Merged
@tobim
Simplify the Findyaml-cpp module
790ca64 
This fixes compatibility with yaml-cpp 0.8, which previously failed
because of a `get_property` call with the wrong target name.
I took the liberty to add a few simplifications along the way.

Signed-off-by: Tobias Mayer <tobim@fastmail.fm>
@tobim tobim force-pushed the simplify-find-yaml-cpp-cmake branch from e99b4af to 790ca64 Compare November 9, 2023 13:25
@remia
Copy link
Copy Markdown
Collaborator

remia commented Nov 9, 2023

Thanks for following up on the questions and the latest updates @tobim!

@opoplawski
Copy link
Copy Markdown

opoplawski commented Nov 11, 2023

Seems like this should mention that it fixes #1858

@doug-walker
Copy link
Copy Markdown
Collaborator

doug-walker commented Nov 12, 2023

Thanks to everyone for your work on this issue!

@doug-walker doug-walker merged commit 1d3b695 into AcademySoftwareFoundation:main Nov 12, 2023
@doug-walker doug-walker mentioned this pull request Nov 12, 2023
Closed
doug-walker added a commit to autodesk-forks/OpenColorIO that referenced this pull request Dec 6, 2023
@tobim @doug-walker
Simplify the Findyaml-cpp module (AcademySoftwareFoundation#1891)
704c7b0 
This fixes compatibility with yaml-cpp 0.8, which previously failed
because of a `get_property` call with the wrong target name.
I took the liberty to add a few simplifications along the way.

Signed-off-by: Tobias Mayer <tobim@fastmail.fm>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
doug-walker added a commit to autodesk-forks/OpenColorIO that referenced this pull request Dec 6, 2023
@tobim @doug-walker
Simplify the Findyaml-cpp module (AcademySoftwareFoundation#1891)
f9d386c 
This fixes compatibility with yaml-cpp 0.8, which previously failed
because of a `get_property` call with the wrong target name.
I took the liberty to add a few simplifications along the way.

Signed-off-by: Tobias Mayer <tobim@fastmail.fm>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 1d3b695)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
doug-walker added a commit that referenced this pull request Dec 8, 2023
@doug-walker @markreidvfx
@KevinJW @cedrik-fuoco-adsk @licy183 @num3ric @michdolan @mdecaria @KelSolaar @Abhineshhh @remia @pennelee @tobim
Integrate main into RB-2.3 branch and update library version (#1918)
92db29b 
* Fix support for X86 32-bit (#1842)

Signed-off-by: Mark Reid <mindmark@gmail.com>
(cherry picked from commit 16b3157)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Add some small arm neon optimizations (#1847)

* Remove unused includes

Signed-off-by: Mark Reid <mindmark@gmail.com>

* Use neon hardware support for f16 conversions

Signed-off-by: Mark Reid <mindmark@gmail.com>

* Add some small neon optimizations
use blendv,floor and fma intrinsics were possible

Signed-off-by: Mark Reid <mindmark@gmail.com>

---------

Signed-off-by: Mark Reid <mindmark@gmail.com>
(cherry picked from commit 14f0afa)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Add links to new release notes documentation (#1848)

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 87126fa)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Changing version to 2.4.0 (#1852)

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 381d1fc)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Correctly recover CXX_FLAGS in CheckSupportSSE2.cmake (#1861)

Signed-off-by: Chongyun Lee <uchkks@protonmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit c429400)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Fix regression in cccid handling when no value is supplied (#1855)

In v1 of OCIO FileTransforms are able to load .cc files
without specifying a cccid. In v2 this broke causing an
exception to be raised instead of using the first cc found
in the file.

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit c7ad353)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Fix missing cache id reset on look update. (#1873)

Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
(cherry picked from commit dddbee0)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* ocioview: Curve Inspector improvements (#1845)

* Curve inspector improvements

- Move README to root app folder
- Change curve inspector grid to always render as a square with 10 segments.
- Add transform init callback to set new transform subscriptions to the current viewer if set to passthrough.

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Improve log range calculation

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Improve channel sample comparison

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Update src/apps/ocioview/ocioview/inspect/curve_inspector.py

Signed-off-by: Michael Dolan <michdolan@gmail.com>

Co-authored-by: Doug Walker <doug.walker@autodesk.com>
Signed-off-by: Michael Dolan <michdolan@gmail.com>

---------

Signed-off-by: Michael Dolan <michdolan@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 8add374)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Fix missing Default View Transform on equal operator (#1886)

Add the missing assignment of the the default view transform when a config is copied using the equal operator

Signed-off-by: Michael De Caria <decariamichael@gmail.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit bc8569b)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Remove circular import caused by typing annotations. (#1882)

Signed-off-by: Thomas Mansencal <thomas.mansencal@gmail.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 1fad466)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* fix(grammatical): Spelling mistakes (#1892)

Signed-off-by: AbhineshJha <abhinesh_223002@saitm.org>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 0d00b2c)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Improve ocioview mac support and simplify dependencies (#1853)

* PySide 6, remove imath, add imageio support

Signed-off-by: Rémi Achard <remiachard@gmail.com>

Remove Imath

Signed-off-by: Rémi Achard <remiachard@gmail.com>

Support imageio as fallback for openimageio

Signed-off-by: Rémi Achard <remiachard@gmail.com>

Further adjustments following latest updates

Signed-off-by: Rémi Achard <remiachard@gmail.com>

Fix pixel probe

Signed-off-by: Remi Achard <remiachard@gmail.com>

Add OpenColorIO to requirements

Signed-off-by: Remi Achard <remiachard@gmail.com>

* Fix rebase issue

Signed-off-by: Remi Achard <remiachard@gmail.com>

---------

Signed-off-by: Remi Achard <remiachard@gmail.com>
Signed-off-by: Thomas Mansencal <thomas.mansencal@gmail.com>
Signed-off-by: Michael Dolan <michdolan@gmail.com>
Co-authored-by: Thomas Mansencal <thomas.mansencal@gmail.com>
Co-authored-by: Michael Dolan <michdolan@gmail.com>
(cherry picked from commit 45544ce)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Issue #1874 Cast to unsigned char for isspace. (#1888)

* Issue #1874 Cast to unsigned char for isspace.

Signed-off-by: pylee <penne.y.lee@intel.com>

* Add unit test.

Signed-off-by: pylee <penne.y.lee@intel.com>

* Add test comment as suggested in code review.

Signed-off-by: pylee <penne.y.lee@intel.com>

---------

Signed-off-by: pylee <penne.y.lee@intel.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit ed85207)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Tentative fix for the doxygen installation in the CI (Windows) (#1890)

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit b94a184)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Simplify the Findyaml-cpp module (#1891)

This fixes compatibility with yaml-cpp 0.8, which previously failed
because of a `get_property` call with the wrong target name.
I took the liberty to add a few simplifications along the way.

Signed-off-by: Tobias Mayer <tobim@fastmail.fm>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 1d3b695)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Skip processor concatenation if the display color space is also data. (#1896)

* Skip processor concatenation if the display view transform is also data.

Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>

* Moved missing display color space exception before processor creation.

Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>

---------

Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 52b4965)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Restore GPU workflow and minor updates to CI (#1899)

* Restore GPU workflow runs

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Enable undefined behaviour sanitizer

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Fix SIMD option for platform_latest

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Fix install_docs_env on CI workflow (not used at the moment)

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Fix OpenEXR build flag

Signed-off-by: Rémi Achard <remiachard@gmail.com>

---------

Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 382dcb6)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Improve handling of pystring include dir (#1901)

Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 9078753)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Improve compatibility with minizip-ng COMPAT mode (#1902)

Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit ffd0f70)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Fix NamedTransform context var issue (#1905)

Signed-off-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 4d64b32)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Fix env serialization for v1 configs (#1904)

Signed-off-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 4f4f30e)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Fix yaml-cpp build issues (#1907)

Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit 41441bb)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Adsk Contrib - Improve heuristics for finding known color spaces (#1913)

* Improve heuristics

Signed-off-by: Doug Walker <doug.walker@autodesk.com>

* Add some comments

Signed-off-by: Doug Walker <doug.walker@autodesk.com>

---------

Signed-off-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit d8852b5)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Add Python 3.12 wheels (#1898)

Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit f2cfec3)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Increment library version to 2.3.1

Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Fix wrong RPATH being injected into Python bindings DSO (#1849)

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
(cherry picked from commit ba2b41e)
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

---------

Signed-off-by: Mark Reid <mindmark@gmail.com>
Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Chongyun Lee <uchkks@protonmail.com>
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
Signed-off-by: Michael Dolan <michdolan@gmail.com>
Signed-off-by: Michael De Caria <decariamichael@gmail.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Signed-off-by: Thomas Mansencal <thomas.mansencal@gmail.com>
Signed-off-by: AbhineshJha <abhinesh_223002@saitm.org>
Signed-off-by: Remi Achard <remiachard@gmail.com>
Signed-off-by: pylee <penne.y.lee@intel.com>
Signed-off-by: Tobias Mayer <tobim@fastmail.fm>
Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Mark Reid <mindmark@gmail.com>
Co-authored-by: Kevin Wheatley <kevin.wheatley@framestore.com>
Co-authored-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
Co-authored-by: Uchiha Kakashi <45286352+licy183@users.noreply.github.com>
Co-authored-by: Éric Renaud-Houde <eric.renaud.houde@gmail.com>
Co-authored-by: Michael Dolan <michdolan@gmail.com>
Co-authored-by: Michael De Caria <decariamichael@gmail.com>
Co-authored-by: Thomas Mansencal <thomas.mansencal@gmail.com>
Co-authored-by: Abhinesh <142514166+AbhineshJha@users.noreply.github.com>
Co-authored-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: PenneLee <pennelee@gmail.com>
Co-authored-by: tobim <tobim+github@fastmail.fm>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@remia remia remia approved these changes

@doug-walker doug-walker doug-walker approved these changes

@cedrik-fuoco-adsk cedrik-fuoco-adsk Awaiting requested review from cedrik-fuoco-adsk

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tobim @doug-walker @remia @opoplawski